Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RHOAIENG-15741: Sync v1.9-branch branch with main branch #458

Merged
merged 9 commits into from
Nov 15, 2024

Conversation

jiridanek
Copy link
Member

@jiridanek jiridanek commented Nov 15, 2024

https://issues.redhat.com/browse/RHOAIENG-15741

git switch -c jd_merge_branch origin/v1.9-branch
git fetch origin v1.9-branch
git reset --hard origin/v1.9-branch
git fetch origin main
git merge --strategy-option=theirs origin/main
git push fork HEAD

v1.9-branch...opendatahub-io:kubeflow:main

jiridanek and others added 8 commits October 2, 2024 14:41
This takes inspiration from:

* The Notebooks 2.0 Dockerfile, which comes from a default recent Kubebuilder template, at
https://github.com/kubeflow/notebooks/blob/notebooks-v2/workspaces/controller/Dockerfile

* The Red Hat build Dockerfile (that's the Cachito part) in an internal repository.

This change brings multiple improvements:

1. Dockerfiles are brought closer together, especially to the Red Hat build; previously, sourcing things in a stand-alone RUN command had no effect
2. The openssl fips-compatible library is linked into the manager binaries, to proactively address fips concerns
…provements

RHOAISTRAT-214: Issue opendatahub-io#362: feat(nbcs): build containers to be fips-ready
Shorter certificates fit better on the screen.
…ests

NO-JIRA: tests(odh-nbc): shorten the test certificates
…99976

[GHA] Update odh and notebook-controller with image main-363bcdb
…tahub-io#456)

Turns out that this "impacted but not vulnerable" prodsec thing is around to haunt us.
This way we'll have full info from govulncheck so that we can better assess various reports.
@openshift-merge-robot openshift-merge-robot added the needs-rebase The PR needs a rebase or there are conflicts label Nov 15, 2024
@openshift-merge-robot

This comment was marked as outdated.

@jiridanek jiridanek added approved and removed needs-rebase The PR needs a rebase or there are conflicts labels Nov 15, 2024
Copy link

openshift-ci bot commented Nov 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jiridanek jiridanek merged commit cb7d54b into opendatahub-io:v1.9-branch Nov 15, 2024
14 of 15 checks passed
@jiridanek jiridanek deleted the jd_merge_branch branch November 15, 2024 11:29
@jiridanek
Copy link
Member Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants